Build-depend on "bsd-mailx | mailx" rather than just "mailx".

diff --git a/debian/changelog b/debian/changelog
index 92d3869a141ffe8636a527e1fc3528d6a7f60bc2..e80f2debba66a5d1e55a2e81daa2ecdc8f7f0d25 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+emacs23 (23.2+1-6) unstable; urgency=low
+
+  * Build-depend on "bsd-mailx | mailx" rather than just "mailx" since
+    the latter is a virtual package.  Thanks to Cyril Brulebois
+    <kibi@debian.org> for the report, and thanks to Mehdi Dogguy
+    <mehdi@debian.org> for the 23.2+1-5.1 NMU. (closes: #600826)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Fri, 26 Nov 2010 11:34:32 -0600
+
 emacs23 (23.2+1-5) unstable; urgency=low
 
   * Apply upstream patches to prevent the string and unibyte-string

diff --git a/debian/control b/debian/control
index 05da4b837ff459c30db0d1c73e43a326a5b73e7a..c5e16fb5efffbe979f78598d4731eb0f14c1c7a7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: emacs23
 Section: editors
 Priority: optional
 Maintainer: Rob Browning <rlb@defaultvalue.org>
-Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev,
+Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev,
  libgif-dev | libungif4-dev, libtiff4-dev | libtiff-dev, xaw3dg-dev,
  libpng12-dev, libjpeg62-dev, libm17n-dev, libotf-dev,
  libgpm-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libdbus-1-dev,

diff --git a/debian/control.in b/debian/control.in
index 21ea9f9e8def9a9cbb91a73bfd0d02cf6d09ee02..21dd6aaaf843de475da906c78b575675962b17b0 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,7 +2,7 @@ Source: @DEB_FLAVOR@
 Section: editors
 Priority: optional
 Maintainer: Rob Browning <rlb@defaultvalue.org>
-Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev,
+Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev,
  libgif-dev | libungif4-dev, libtiff4-dev | libtiff-dev, xaw3dg-dev,
  libpng12-dev, libjpeg62-dev, libm17n-dev, libotf-dev,
  libgpm-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libdbus-1-dev,